bitkeeper revision 1.1389.5.41 (428086b4WGIdNR8TJaRkbtDcDMeorg)

Fix the 32-bit build (broken by previous changeset).
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index ddb605e9cf695b4514a1bc43644de45c9000304a..dfc64ddf9ce9fcd9a075452e9b0f62639a124a2f 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -35,6 +35,7 @@ clean:
        rm -f x86_32/*.o x86_32/*~ x86_32/core
        rm -f x86_64/*.o x86_64/*~ x86_64/core
        rm -f mtrr/*.o mtrr/*~ mtrr/core
+       rm -f acpi/*.o acpi/*~ acpi/core
 
 delete-unfresh-files:
        # nothing

diff --git a/xen/include/asm-x86/x86_32/domain_page.h b/xen/include/asm-x86/x86_32/domain_page.h
index b0ffad43a4be8920d1848602a107ca0eb63c09b6..7ebb72eb72e91c9a2c73866a8b12674869b0fcf2 100644 (file)
--- a/xen/include/asm-x86/x86_32/domain_page.h
+++ b/xen/include/asm-x86/x86_32/domain_page.h
@@ -31,13 +31,11 @@ struct map_dom_mem_cache {
     void *va;
 };
 
-#define MAP_DOM_MEM_CACHE_INIT { .pa = 0 }
-
 static inline void
 init_map_domain_mem_cache(struct map_dom_mem_cache *cache)
 {
     ASSERT(cache != NULL);
-    *cache = MAP_DOM_MEM_CACHE_INIT;
+    cache->pa = 0;
 }
 
 static inline void *